remove conflict marker

diff --git a/ChangeLog b/ChangeLog
index a68c89a90a8094c392a7487a5cb1699b2a1a22c2..5f4d8d01473798491bc5a5809e919b482b9f27c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>
        For now, use gtk_file_system_insert_bookmark() with -1 for the
        position.  DnD will come next.
 
->>>>>>> 1.5045
 Fri Feb 27 21:42:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_relayout): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a68c89a90a8094c392a7487a5cb1699b2a1a22c2..5f4d8d01473798491bc5a5809e919b482b9f27c3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>
        For now, use gtk_file_system_insert_bookmark() with -1 for the
        position.  DnD will come next.
 
->>>>>>> 1.5045
 Fri Feb 27 21:42:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_relayout): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a68c89a90a8094c392a7487a5cb1699b2a1a22c2..5f4d8d01473798491bc5a5809e919b482b9f27c3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>
        For now, use gtk_file_system_insert_bookmark() with -1 for the
        position.  DnD will come next.
 
->>>>>>> 1.5045
 Fri Feb 27 21:42:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_relayout): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a68c89a90a8094c392a7487a5cb1699b2a1a22c2..5f4d8d01473798491bc5a5809e919b482b9f27c3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>
        For now, use gtk_file_system_insert_bookmark() with -1 for the
        position.  DnD will come next.
 
->>>>>>> 1.5045
 Fri Feb 27 21:42:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_relayout): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a68c89a90a8094c392a7487a5cb1699b2a1a22c2..5f4d8d01473798491bc5a5809e919b482b9f27c3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -44,7 +44,6 @@ Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>
        For now, use gtk_file_system_insert_bookmark() with -1 for the
        position.  DnD will come next.
 
->>>>>>> 1.5045
 Fri Feb 27 21:42:28 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_relayout):